From: Jeroen van der Heijden Date: Mon, 8 Oct 2018 07:19:03 +0000 (+0200) Subject: Change http to https, use args for all tests X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~8^2~24 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=776f480e857e54aa0d3a597f3f75a28a982e04a3;p=siridb-server.git Change http to https, use args for all tests --- diff --git a/build_deb.py b/build_deb.py index 3f05c745..dea06eb6 100755 --- a/build_deb.py +++ b/build_deb.py @@ -99,7 +99,7 @@ if __name__ == '__main__': archother={ '32bit': 'i386', '64bit': 'x86_64'}[platform.architecture()[0]], - homepage='http://siridb.net', + homepage='https://siridb.net', distribution=_get_distribution(), curdate=datetime.datetime.utcnow().strftime('%d %b %Y'), year=datetime.datetime.utcnow().year, diff --git a/debian/control b/debian/control index 08be0c73..972974f1 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 11), uuid-dev, libcleri-dev Standards-Version: 4.1.3 -Homepage: http://siridb.net +Homepage: https://siridb.net Vcs-Browser: https://github.com/SiriDB/siridb-server Vcs-Git: https://github.com/SiriDB/siridb-server.git diff --git a/debian/copyright b/debian/copyright index cf2d830e..958c37c4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: siridb-server -Source: http://siridb.net +Source: https://siridb.net Files: * Copyright: 2016 Transceptor Technology diff --git a/itest/test_buffer.py b/itest/test_buffer.py index c3d387a0..e1c9d57b 100644 --- a/itest/test_buffer.py +++ b/itest/test_buffer.py @@ -18,6 +18,7 @@ from testing import ServerError from testing import SiriDB from testing import TestBase from testing import UserAuthError +from testing import parse_args class TestBuffer(TestBase): @@ -116,8 +117,5 @@ class TestBuffer(TestBase): if __name__ == '__main__': - SiriDB.LOG_LEVEL = 'INFO' - Server.HOLD_TERM = True - Server.MEM_CHECK = True - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestBuffer()) diff --git a/itest/test_cluster.py b/itest/test_cluster.py index aab5369d..8b47f79b 100644 --- a/itest/test_cluster.py +++ b/itest/test_cluster.py @@ -17,6 +17,7 @@ from testing import ServerError from testing import SiriDB from testing import TestBase from testing import UserAuthError +from testing import parse_args class TestCluster(TestBase): @@ -65,8 +66,5 @@ class TestCluster(TestBase): if __name__ == '__main__': - SiriDB.LOG_LEVEL = 'INFO' - Server.HOLD_TERM = True - Server.MEM_CHECK = True - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestCluster()) diff --git a/itest/test_compression.py b/itest/test_compression.py index 411dc10e..7579df27 100644 --- a/itest/test_compression.py +++ b/itest/test_compression.py @@ -17,6 +17,8 @@ from testing import ServerError from testing import SiriDB from testing import TestBase from testing import UserAuthError +from testing import parse_args + TIME_PRECISION = 'ms' @@ -119,8 +121,5 @@ class TestCompression(TestBase): if __name__ == '__main__': random.seed(1) - SiriDB.LOG_LEVEL = 'CRITICAL' - Server.HOLD_TERM = True - Server.MEM_CHECK = True - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestCompression()) diff --git a/itest/test_group.py b/itest/test_group.py index 3e07edf8..e8c99159 100644 --- a/itest/test_group.py +++ b/itest/test_group.py @@ -17,6 +17,7 @@ from testing import ServerError from testing import SiriDB from testing import TestBase from testing import UserAuthError +from testing import parse_args DATA = { @@ -176,8 +177,5 @@ class TestGroup(TestBase): if __name__ == '__main__': - SiriDB.LOG_LEVEL = 'CRITICAL' - Server.HOLD_TERM = True - Server.MEM_CHECK = True - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestGroup()) diff --git a/itest/test_insert.py b/itest/test_insert.py index d5c71ff5..592de753 100644 --- a/itest/test_insert.py +++ b/itest/test_insert.py @@ -17,6 +17,8 @@ from testing import ServerError from testing import SiriDB from testing import TestBase from testing import UserAuthError +from testing import parse_args + TIME_PRECISION = 'ns' @@ -187,8 +189,5 @@ class TestInsert(TestBase): if __name__ == '__main__': random.seed(1) - SiriDB.LOG_LEVEL = 'CRITICAL' - Server.HOLD_TERM = True - Server.MEM_CHECK = True - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestInsert()) diff --git a/itest/test_list.py b/itest/test_list.py index 5c6f9f22..533ecf78 100644 --- a/itest/test_list.py +++ b/itest/test_list.py @@ -17,6 +17,8 @@ from testing import ServerError from testing import SiriDB from testing import TestBase from testing import UserAuthError +from testing import parse_args + TIME_PRECISION = 's' @@ -107,8 +109,5 @@ class TestList(TestBase): if __name__ == '__main__': - SiriDB.LOG_LEVEL = 'CRITICAL' - Server.HOLD_TERM = True - Server.MEM_CHECK = True - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestList()) diff --git a/itest/test_log.py b/itest/test_log.py index 9033aa32..263d7dbb 100644 --- a/itest/test_log.py +++ b/itest/test_log.py @@ -17,6 +17,7 @@ from testing import ServerError from testing import SiriDB from testing import TestBase from testing import UserAuthError +from testing import parse_args DATA = { @@ -249,8 +250,5 @@ class TestLog(TestBase): if __name__ == '__main__': - SiriDB.LOG_LEVEL = 'CRITICAL' - Server.HOLD_TERM = True - Server.MEM_CHECK = True - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestLog()) diff --git a/itest/test_pipe_support.py b/itest/test_pipe_support.py index 37bf9ff6..8739c8ff 100644 --- a/itest/test_pipe_support.py +++ b/itest/test_pipe_support.py @@ -19,6 +19,8 @@ from testing import SiriDB from testing import TestBase from testing import UserAuthError from testing import SiriDBAsyncUnixConnection +from testing import parse_args + PIPE_NAME = '/tmp/siridb_pipe_test.sock' @@ -74,8 +76,5 @@ class TestPipeSupport(TestBase): if __name__ == '__main__': - SiriDB.LOG_LEVEL = 'CRITICAL' - Server.HOLD_TERM = True - Server.MEM_CHECK = True - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestPipeSupport()) diff --git a/itest/test_pool.py b/itest/test_pool.py index 5e4bde9e..efbbadc6 100644 --- a/itest/test_pool.py +++ b/itest/test_pool.py @@ -17,6 +17,7 @@ from testing import ServerError from testing import SiriDB from testing import TestBase from testing import UserAuthError +from testing import parse_args class TestPool(TestBase): @@ -94,8 +95,5 @@ class TestPool(TestBase): if __name__ == '__main__': - SiriDB.LOG_LEVEL = 'CRITICAL' - Server.HOLD_TERM = True - Server.MEM_CHECK = True - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestPool()) diff --git a/itest/test_series.py b/itest/test_series.py index 42c6d750..716ffe53 100644 --- a/itest/test_series.py +++ b/itest/test_series.py @@ -17,6 +17,7 @@ from testing import ServerError from testing import SiriDB from testing import TestBase from testing import UserAuthError +from testing import parse_args PI = 'ԉ' @@ -112,8 +113,5 @@ class TestSeries(TestBase): if __name__ == '__main__': - SiriDB.LOG_LEVEL = 'CRITICAl' - Server.HOLD_TERM = True - Server.MEM_CHECK = True - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestSeries()) diff --git a/itest/test_server.py b/itest/test_server.py index 6ba410e7..1a41af1f 100644 --- a/itest/test_server.py +++ b/itest/test_server.py @@ -17,6 +17,7 @@ from testing import ServerError from testing import SiriDB from testing import TestBase from testing import UserAuthError +from testing import parse_args class TestServer(TestBase): @@ -31,7 +32,7 @@ class TestServer(TestBase): await self.client0.connect() await self.db.add_pool(self.server1) - await self.assertIsRunning(self.db, self.client0, timeout=12) + await self.assertIsRunning(self.db, self.client0, timeout=20) await asyncio.sleep(5) await self.client1.connect() @@ -149,8 +150,5 @@ class TestServer(TestBase): if __name__ == '__main__': - SiriDB.LOG_LEVEL = 'CRITICAL' - Server.HOLD_TERM = True - Server.MEM_CHECK = True - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestServer()) diff --git a/itest/test_syslog.py b/itest/test_syslog.py index ae17878b..734b5768 100644 --- a/itest/test_syslog.py +++ b/itest/test_syslog.py @@ -21,6 +21,8 @@ from testing import ServerError from testing import SiriDB from testing import TestBase from testing import UserAuthError +from testing import parse_args + # Compression OFF: # du --bytes testdir/dbpath0/dbtest/shards/ @@ -86,8 +88,5 @@ class TestSyslog(TestBase): if __name__ == '__main__': - SiriDB.LOG_LEVEL = 'CRITICAL' - Server.HOLD_TERM = True - Server.MEM_CHECK = True - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestSyslog()) diff --git a/itest/test_user.py b/itest/test_user.py index 0015124c..b60bc645 100644 --- a/itest/test_user.py +++ b/itest/test_user.py @@ -17,6 +17,7 @@ from testing import ServerError from testing import SiriDB from testing import TestBase from testing import UserAuthError +from testing import parse_args class TestUser(TestBase): @@ -188,8 +189,5 @@ class TestUser(TestBase): if __name__ == '__main__': - SiriDB.LOG_LEVEL = 'CRITICAL' - Server.HOLD_TERM = False - Server.MEM_CHECK = False - Server.BUILDTYPE = 'Debug' + parse_args() run_test(TestUser()) diff --git a/itest/testing/task.py b/itest/testing/task.py index 7f26bd63..0a6f2564 100644 --- a/itest/testing/task.py +++ b/itest/testing/task.py @@ -33,4 +33,3 @@ class Task(): print( f'{self.title:.<76}' f'{Color.error("FAILED")} ({self.duration:.2f} seconds)') -